From 21fdd632ed57693be707b36155ebf419bc79829b Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 1 Nov 2004 02:27:05 +0000 Subject: [PATCH] Use somewhat more "real" error strings. --- gpsbabel/jeeps/gpsusbwin.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c index 21cd9b5d9..c841351c4 100644 --- a/gpsbabel/jeeps/gpsusbwin.c +++ b/gpsbabel/jeeps/gpsusbwin.c @@ -87,7 +87,7 @@ gusb_open(const char *pname) DIGCF_PRESENT|DIGCF_INTERFACEDEVICE); if (hdevinfo == INVALID_HANDLE_VALUE) { - fatal("XXX"); + GPS_Serial_Error("SetupDiGetClassDevs failed"); return 0; } @@ -95,7 +95,8 @@ gusb_open(const char *pname) devinterface.cbSize = sizeof(SP_INTERFACE_DEVICE_DATA); if (!SetupDiEnumDeviceInterfaces(hdevinfo, NULL, &GARMIN_GUID, 0, &devinterface)) { - fatal("blah"); + GPS_Serial_Error("SetupDiEnumDeviceInterfaces"); + warning("Is the unit powered up and connected?"); return 0; } @@ -107,7 +108,8 @@ gusb_open(const char *pname) devinfo.cbSize = sizeof(SP_DEVINFO_DATA); if (!SetupDiGetDeviceInterfaceDetail(hdevinfo, &devinterface, pdd, size, NULL, &devinfo)) { - fatal("ZZZ"); + GPS_Serial_Error("SetupDiGetDeviceInterfaceDetail"); + return 0; } /* Whew. All that just to get something we can open... */ @@ -117,7 +119,7 @@ gusb_open(const char *pname) 0, NULL, OPEN_EXISTING, 0, NULL ); if (usb_handle == INVALID_HANDLE_VALUE) { GPS_Serial_Error("CreateFile failed"); - fatal("CreateFile"); + return 0; } if(!DeviceIoControl(usb_handle, IOCTL_GARMIN_USB_BULK_OUT_PACKET_SIZE, NULL, 0, -- 2.30.2